A completely mechanical search and replace to swap the first argument

A completely mechanical search and replace to swap the first argument
for an xml_generic callback with a typdef that can be swapped at compile
time.

Yes, this is a hint of things to come to reduce future bulky merges.